Autogenerated HTML docs for v1.7.2.1-158-gbd3a97
diff --git a/git-config.html b/git-config.html index 7bdcc5f..b45edc9 100644 --- a/git-config.html +++ b/git-config.html
@@ -924,7 +924,7 @@ <dd> <p> Advice shown when <a href="git-merge.html">git-merge(1)</a> refuses to - merge to avoid overwritting local changes. + merge to avoid overwriting local changes. Default: true. </p> </dd> @@ -1330,7 +1330,7 @@ <dd> <p> Maximum number of bytes to reserve for caching base objects - that multiple deltafied objects reference. By storing the + that may be referenced by multiple deltified objects. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base objects multiple times. @@ -1559,7 +1559,7 @@ <p> If true, git-am will call git-mailsplit for patches in mbox format with parameter <em>--keep-cr</em>. In this case git-mailsplit will - not remove <tt>\r</tt> from lines ending with <tt>\r\n</tt>. Can be overrriden + not remove <tt>\r</tt> from lines ending with <tt>\r\n</tt>. Can be overridden by giving <em>--no-keep-cr</em> from the command line. See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>. </p> @@ -2061,6 +2061,16 @@ </p> </dd> <dt> +diff.ignoreSubmodules +</dt> +<dd> +<p> + Sets the default value of --ignore-submodules. Note that this + affects only <em>git diff</em> Porcelain, and not lower level <em>diff</em> + commands such as <em>git diff-files</em>. +</p> +</dd> +<dt> diff.suppressBlankEmpty </dt> <dd> @@ -2391,7 +2401,7 @@ If true, the server will look up the end-of-line conversion attributes for files to determine the <em>-k</em> modes to use. If the attributes force git to treat a file as text, - the <em>-k</em> mode will be left blank so cvs clients will + the <em>-k</em> mode will be left blank so CVS clients will treat it as text. If they suppress text conversion, the file will be set with <em>-kb</em> mode, which suppresses any newline munging the client might otherwise do. If the attributes do not allow @@ -2910,7 +2920,9 @@ </dt> <dd> <p> - The module path for an apache httpd used by <a href="git-instaweb.html">git-instaweb(1)</a>. + The default module path for <a href="git-instaweb.html">git-instaweb(1)</a> to use + instead of /usr/lib/apache2/modules. Only used if httpd + is Apache. </p> </dd> <dt> @@ -3887,6 +3899,24 @@ </p> </dd> <dt> +submodule.<name>.ignore +</dt> +<dd> +<p> + Defines under what circumstances "git status" and the diff family show + a submodule as modified. When set to "all", it will never be considered + modified, "dirty" will ignore all changes to the submodules work tree and + takes only differences between the HEAD of the submodule and the commit + recorded in the superproject into account. "untracked" will additionally + let submodules with modified tracked files in their work tree show up. + Using "none" (the default when this option is not set) also shows + submodules that have untracked files in their work tree as changed. + This setting overrides any setting made in .gitmodules for this submodule, + both settings can be overriden on the command line by using the + "--ignore-submodules" option. +</p> +</dd> +<dt> tar.umask </dt> <dd> @@ -4000,7 +4030,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-07-26 09:02:12 UTC +Last updated 2010-08-18 22:14:48 UTC </div> </div> </body>
